Define gnttab_shared_gpfn() for use in common code.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index e8b5d05b8aaa75599a84aa4265fa6971598f3ff8..efdef27aa31b22b2cc7f6a70f5c65378e14d0bcb 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -481,7 +481,7 @@ gnttab_setup_table(
     gnttab_setup_table_t  op;
     struct domain        *d;
     int                   i;
-    unsigned long         mfn;
+    unsigned long         gpfn;
 
     if ( count != 1 )
         return -EINVAL;
@@ -523,8 +523,8 @@ gnttab_setup_table(
         (void)put_user(GNTST_okay, &uop->status);
         for ( i = 0; i < op.nr_frames; i++ )
         {
-            mfn = __mfn_to_gpfn(d, gnttab_shared_mfn(d, d->grant_table, i));
-            (void)put_user(mfn, &op.frame_list[i]);
+            gpfn = gnttab_shared_gpfn(d, d->grant_table, i);
+            (void)put_user(gpfn, &op.frame_list[i]);
         }
     }
 

diff --git a/xen/include/asm-ia64/grant_table.h b/xen/include/asm-ia64/grant_table.h
index 5bf3f68bd05cdc9c58878dd6594aba3bb95881cc..ff0aaae9aaffce06ae0afef42389dd7ddfbe5cf2 100644 (file)
--- a/xen/include/asm-ia64/grant_table.h
+++ b/xen/include/asm-ia64/grant_table.h
@@ -14,7 +14,7 @@
 
 #define gnttab_create_shared_mfn(d, t, i) ((void)0)
 
-#define gnttab_shared_mfn(d, t, i)                                      \
+#define gnttab_shared_gpfn(d, t, i)                                     \
     ( ((d) == dom0) ?                                                   \
       ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i)) :               \
       (map_domain_page((d), 1UL<<40, virt_to_phys((t)->shared)),        \

diff --git a/xen/include/asm-x86/grant_table.h b/xen/include/asm-x86/grant_table.h
index 38f46b69c9683493d1b5966d1a50a6ed4c3562bb..3b2d1f76c3dc4dd522a7499dbf479a1ff500f587 100644 (file)
--- a/xen/include/asm-x86/grant_table.h
+++ b/xen/include/asm-x86/grant_table.h
@@ -33,6 +33,9 @@ int steal_page_for_grant_transfer(
 #define gnttab_shared_mfn(d, t, i)                      \
     ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i))
 
+#define gnttab_shared_gpfn(d, t, i)                     \
+    (__mfn_to_gpfn(d, gnttab_shared_mfn(d, t, i)))
+
 #define gnttab_log_dirty(d, f) mark_dirty((d), (f))
 
 #endif /* __ASM_GRANT_TABLE_H__ */